merge with xen-unstable.hg (staging)
authorAlex Williamson <alex.williamson@hp.com>
Tue, 22 Jan 2008 15:30:40 +0000 (08:30 -0700)
committerAlex Williamson <alex.williamson@hp.com>
Tue, 22 Jan 2008 15:30:40 +0000 (08:30 -0700)

Trivial merge